diff --git a/urlwatch/Dockerfile b/urlwatch/Dockerfile
index f2a83f1..0095b79 100644
--- a/urlwatch/Dockerfile
+++ b/urlwatch/Dockerfile
@@ -5,8 +5,6 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
-
 RUN set -xe \
     && apk add --no-cache ca-certificates \
                           bash            \
diff --git a/urlwatch/README.md b/urlwatch/README.md
index d6b3868..e10a422 100644
--- a/urlwatch/README.md
+++ b/urlwatch/README.md
@@ -12,6 +12,8 @@ services:
     image: vimagick/urlwatch
     volumes:
       - ./data:/root/.urlwatch
+    environment:
+      - EDITOR=/usr/bin/vi
     restart: unless-stopped
 ```
 
@@ -21,7 +23,7 @@ services:
 ---
 
 name: urlwatch
-url: "https://github.com/thp/urlwatch/tags"
+url: https://github.com/thp/urlwatch/tags
 filter:
 - xpath: '(//h4[@data-test-selector="tag-title"]/a)[1]'
 - html2text: re
@@ -30,10 +32,10 @@ filter:
 ---
 
 name: shadowsocks-libev
-url: "https://github.com/shadowsocks/shadowsocks-libev/releases/latest"
+url: https://api.github.com/repos/shadowsocks/shadowsocks-libev/releases/latest
 filter:
-- css: "div.flex-1>h1"
-- html2text: re
+- shellpipe: 'jq -r .tag_name'
+- strip:
 
 ...
 ```
diff --git a/urlwatch/data/urls.yaml b/urlwatch/data/urls.yaml
index 758ae8e..acbf379 100644
--- a/urlwatch/data/urls.yaml
+++ b/urlwatch/data/urls.yaml
@@ -1,7 +1,7 @@
 ---
 
 name: urlwatch
-url: "https://github.com/thp/urlwatch/tags"
+url: https://github.com/thp/urlwatch/tags
 filter:
 - xpath: '(//h4[@data-test-selector="tag-title"]/a)[1]'
 - html2text: re
@@ -10,9 +10,9 @@ filter:
 ---
 
 name: shadowsocks-libev
-url: "https://github.com/shadowsocks/shadowsocks-libev/releases/latest"
+url: https://api.github.com/repos/shadowsocks/shadowsocks-libev/releases/latest
 filter:
-- css: "div.flex-1>h1"
-- html2text: re
+- shellpipe: 'jq -r .tag_name'
+- strip:
 
 ...
diff --git a/urlwatch/docker-compose.yml b/urlwatch/docker-compose.yml
index 6f620c1..c88385a 100644
--- a/urlwatch/docker-compose.yml
+++ b/urlwatch/docker-compose.yml
@@ -4,4 +4,6 @@ services:
     image: vimagick/urlwatch
     volumes:
       - ./data:/root/.urlwatch
+    environment:
+      - EDITOR=/usr/bin/vi
     restart: unless-stopped